dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5dd1bbd
)
ResourceLoader.php: Fix E_NOTICE
author
Timo Tijhof
<ttijhof@wikimedia.org>
Fri, 29 Jun 2012 08:40:28 +0000
(10:40 +0200)
committer
Timo Tijhof
<ttijhof@wikimedia.org>
Fri, 29 Jun 2012 08:40:28 +0000
(10:40 +0200)
* Follows-up
d3286132461554a949d11e07bfba2aaea025608a
Change-Id: Idc2da99c941047a3f5e345457fd7b71cdf417257
includes/resourceloader/ResourceLoader.php
patch
|
blob
|
history
diff --git
a/includes/resourceloader/ResourceLoader.php
b/includes/resourceloader/ResourceLoader.php
index
93dac7b
..
8b1452e
100644
(file)
--- a/
includes/resourceloader/ResourceLoader.php
+++ b/
includes/resourceloader/ResourceLoader.php
@@
-752,7
+752,11
@@
class ResourceLoader {
}
break;
case 'styles':
- $out .= $styles['']; // Code above has set $styles['']
+ // We no longer seperate into media, they are all concatenated now with
+ // custom media type groups into @media .. {} sections.
+ // Module returns either an empty array or an array with '' (no media type) as
+ // only key.
+ $out .= isset( $styles[''] ) ? $styles[''] : '';
break;
case 'messages':
$out .= self::makeMessageSetScript( new XmlJsCode( $messagesBlob ) );